Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: Fix regexp to detect installed FFmpeg version #11554

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ysalmon
Copy link

@ysalmon ysalmon commented Nov 22, 2024

Description

This adds a + in the regexp which is used to detect the version of FFmpeg on the system.

Motivation and Context

Compiling was failing on my system (Ubuntu 24.04) with cmake complaining about FFmpeg's version. My system version is 6.1.1-3ubuntu5+esm2, which was detected as an empty string because the regexp does not match.

How Has This Been Tested?

I successfully compiled OBS.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • [N/A] My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch. I do not understand what that means.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • [N/A] I have included updates to all appropriate documentation.

The regexp was not tolerating a + sign is the version string,
causing configuration to fail on Ubuntu 24.04 when the installed
version is 6.1.1-3ubuntu5+esm2.
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks okay at a glance.

@RytoEX RytoEX requested a review from PatTheMav November 22, 2024 21:00
@RytoEX RytoEX self-assigned this Nov 22, 2024
@WizardCM WizardCM added the Bug Fix Non-breaking change which fixes an issue label Nov 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Fix Non-breaking change which fixes an issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants